From 277a6f4701f43cc70bb57bd39ee783f75370442e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Sep 2005 19:59:56 +0000 Subject: [PATCH] Handle invalid fontnames better. (#315187, Ed Catmur) 2005-09-09 Matthias Clasen * gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Handle invalid fontnames better. (#315187, Ed Catmur) --- ChangeLog | 2 -- ChangeLog.pre-2-10 | 2 -- gtk/gtkfontbutton.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 544a636256..6a763ff79d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,3 @@ -2005-09-09 Matthias Clasen - * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle invalid fontnames better. (#136926, Michael R. Walton) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 544a636256..6a763ff79d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,3 @@ -2005-09-09 Matthias Clasen - * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle invalid fontnames better. (#136926, Michael R. Walton) diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index c9cd587db3..d49c62d775 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -869,7 +869,7 @@ gtk_font_button_update_font_info (GtkFontButton *font_button) #endif style = NULL; - if (font_button->priv->show_style) + if (font_button->priv->show_style && family) { PangoFontFamily **families; PangoFontFace **faces; -- 2.30.2